Use rm instead of ln -f to replace existing links. (#354849, James Evans)

2006-10-02  Matthias Clasen  <mclasen@redhat.com>

	* gtk/Makefile.am (stamp-icons): Use rm instead of ln -f to
	replace existing links.  (#354849, James Evans)

diff --git a/ChangeLog b/ChangeLog
index 73bcb2ec9826b2b4c1811531298993763c753f8f..070c19dfa5361a70b6f1daaa02437da911424050 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/Makefile.am (stamp-icons): Use rm instead of ln -f to
+       replace existing links.  (#354849, James Evans)
+
 2006-10-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkexpander.c (gtk_expander_realize) 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 427da65fb4b80fe4588ac7705bf6cf3d0c21164e..cf85bc6e133fa7165718931cbdeca964df8ab2b3 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1094,15 +1094,24 @@ stamp-icons: $(STOCK_ICONS)
         fi &&                                                                  \
        for i in 16 24; do                                                      \
           (cd stock-icons/$$i                                                  \
-          && $(LN_S) -f gtk-go-forward-ltr.png gtk-go-back-rtl.png             \
-          && $(LN_S) -f gtk-go-back-ltr.png gtk-go-forward-rtl.png             \
-          && $(LN_S) -f gtk-goto-last-ltr.png gtk-goto-first-rtl.png           \
-          && $(LN_S) -f gtk-goto-first-ltr.png gtk-goto-last-rtl.png           \
-          && $(LN_S) -f gtk-media-rewind-ltr.png gtk-media-forward-rtl.png     \
-          && $(LN_S) -f gtk-media-previous-ltr.png gtk-media-next-rtl.png      \
-          && $(LN_S) -f gtk-media-next-ltr.png gtk-media-previous-rtl.png      \
-          && $(LN_S) -f gtk-media-forward-ltr.png gtk-media-rewind-rtl.png     \
-          && $(LN_S) -f gtk-floppy.png gtk-save.png)                           \
+          && $(RM) gtk-go-back-rtl.png                                         \
+          && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png                \
+          && $(RM) gtk-go-forward-rtl.png                                      \
+          && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png                \
+          && $(RM) gtk-goto-first-rtl.png                                      \
+          && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png              \
+          && $(RM) gtk-goto-last-rtl.png                                       \
+          && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png              \
+          && $(RM) gtk-media-forward-rtl.png                                   \
+          && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png        \
+          && $(RM) gtk-mdedia-next-rtl.png                                     \
+          && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png         \
+          && $(RM) gtk-media-previous-rtl.png                                  \
+          && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png         \
+          && $(RM) gtk-media-rewind-rtl.png                                    \
+          && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png        \
+          && $(RM) gtk-save.png                                                \
+          && $(LN_S) gtk-floppy.png gtk-save.png)                              \
        done                                                                    \
        && touch stamp-icons